From 3c1a83eedddac3475d71a7391af98e0e32250cf3 Mon Sep 17 00:00:00 2001 From: Debian LibreOffice Maintainers Date: Wed, 15 Jul 2020 19:31:45 +0100 Subject: [PATCH] no-openssl don't add -lssl etc if not needed (because we use system-postgresql) Gbp-Pq: Name no-openssl.diff --- RepositoryExternal.mk | 72 +------------------ config_host.mk.in | 4 -- configure.ac | Bin 485018 -> 482473 bytes connectivity/Library_postgresql-sdbc-impl.mk | 1 - external/Module_external.mk | 1 - oox/CppunitTest_oox_tokenmap.mk | 9 --- oox/Library_oox.mk | 9 --- ucb/CppunitTest_ucb_webdav_local_neon.mk | 1 - ucb/CppunitTest_ucb_webdav_neon_opts.mk | 1 - ucb/CppunitTest_ucb_webdav_propfindcache.mk | 1 - ucb/CppunitTest_ucb_webdav_res_access.mk | 1 - ucb/Library_ucpdav1.mk | 2 - 12 files changed, 2 insertions(+), 100 deletions(-) diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk index d8a2e743081..cc7b2dbe181 100644 --- a/RepositoryExternal.mk +++ b/RepositoryExternal.mk @@ -1558,75 +1558,6 @@ endef endif # SYSTEM_HARFBUZZ -ifeq ($(DISABLE_OPENSSL),TRUE) - -gb_ExternalProject__use_openssl:= -gb_LinkTarget__use_openssl_headers:= -gb_LinkTarget__use_openssl:= - -else # !DISABLE_OPENSSL - -ifneq ($(SYSTEM_OPENSSL),) - -gb_LinkTarget__use_openssl_headers:= -gb_ExternalProject__use_openssl:= - -define gb_LinkTarget__use_openssl -$(call gb_LinkTarget_set_include,$(1),\ - $$(INCLUDE) \ - $(OPENSSL_CFLAGS) \ -) -$(call gb_LinkTarget_add_libs,$(1),$(OPENSSL_LIBS)) - -endef - -else # !SYSTEM_OPENSSL - -$(eval $(call gb_Helper_register_packages_for_install,ooo, \ - openssl \ -)) - -define gb_ExternalProject__use_openssl -$(call gb_ExternalProject_use_package,$(1),openssl) - -endef - -define gb_LinkTarget__use_openssl_headers -$(call gb_LinkTarget_use_external_project,$(1),openssl) -$(call gb_LinkTarget_set_include,$(1),\ - -I$(call gb_UnpackedTarball_get_dir,openssl)/include \ - $$(INCLUDE) \ -) - -endef - -define gb_LinkTarget__use_openssl -$(call gb_LinkTarget_use_package,$(1),openssl) -ifeq ($(OS),WNT) -$(call gb_LinkTarget_add_libs,$(1),\ - $(call gb_UnpackedTarball_get_dir,openssl)/out32dll/ssleay32.lib \ - $(call gb_UnpackedTarball_get_dir,openssl)/out32dll/libeay32.lib \ -) -else -$(call gb_LinkTarget_add_libs,$(1),\ - $(call gb_UnpackedTarball_get_dir,openssl)/libssl.a \ - $(call gb_UnpackedTarball_get_dir,openssl)/libcrypto.a \ -) -$(call gb_LinkTarget_use_external_project,$(1),openssl) -ifeq ($(OS),SOLARIS) -$(call gb_LinkTarget_add_libs,$(1),\ - -lnsl \ - -lsocket \ -) -endif -endif - -endef - -endif # SYSTEM_OPENSSL -endif # DISABLE_OPENSSL - - ifeq ($(DISABLE_OPENSSL),TRUE) define gb_LinkTarget__use_gnutls @@ -3076,9 +3007,10 @@ $(call gb_LinkTarget_add_libs,$(1),\ $(call gb_UnpackedTarball_get_dir,postgresql)/src/interfaces/libpq/libpq$(gb_StaticLibrary_PLAINEXT) \ ) -ifeq ($(OS),WNT) $(call gb_LinkTarget_use_external,$(1),openssl) +ifeq ($(OS),WNT) + $(call gb_LinkTarget_use_system_win32_libs,$(1),\ secur32 \ ws2_32 \ diff --git a/config_host.mk.in b/config_host.mk.in index 0fb3328c7b7..5b9d363e51b 100644 --- a/config_host.mk.in +++ b/config_host.mk.in @@ -132,7 +132,6 @@ export DEFAULT_BRAND_IMAGES=@DEFAULT_BRAND_IMAGES@ export DICT_SYSTEM_DIR=@DICT_SYSTEM_DIR@ export DISABLE_CVE_TESTS=@DISABLE_CVE_TESTS@ export DISABLE_DYNLOADING=@DISABLE_DYNLOADING@ -export DISABLE_OPENSSL=@DISABLE_OPENSSL@ export DISABLE_PYTHON=@DISABLE_PYTHON@ export DLOPEN_LIBS=@DLOPEN_LIBS@ export DLLTOOL=@DLLTOOL@ @@ -454,8 +453,6 @@ export OFFICEOTRON=@OFFICEOTRON@ export BFFVALIDATOR=@BFFVALIDATOR@ export OOO_JUNIT_JAR=@OOO_JUNIT_JAR@ export OOO_VENDOR=@OOO_VENDOR@ -export OPENSSL_CFLAGS=$(gb_SPACE)@OPENSSL_CFLAGS@ -export OPENSSL_LIBS=$(gb_SPACE)@OPENSSL_LIBS@ export OPENSYMBOL_TTF=@OPENSYMBOL_TTF@ export ORCUS_CFLAGS=$(gb_SPACE)@ORCUS_CFLAGS@ export ORCUS_LIBS=$(gb_SPACE)@ORCUS_LIBS@ @@ -596,7 +593,6 @@ export SYSTEM_NSS=@SYSTEM_NSS@ export SYSTEM_ODBC_HEADERS=@SYSTEM_ODBC_HEADERS@ export SYSTEM_ODFGEN=@SYSTEM_ODFGEN@ export SYSTEM_OPENLDAP=@SYSTEM_OPENLDAP@ -export SYSTEM_OPENSSL=@SYSTEM_OPENSSL@ export SYSTEM_PAGEMAKER=@SYSTEM_PAGEMAKER@ export SYSTEM_POPPLER=@SYSTEM_POPPLER@ export SYSTEM_POSTGRESQL=@SYSTEM_POSTGRESQL@ diff --git a/configure.ac b/configure.ac index cb7da629e5fdae8f2ad10dcd4f79ee720901a414..933c756e304e32b0722bf6ad0bf812da99f9f61e 100644 GIT binary patch delta 34 qcmbPrR(9o1*@hOz7N!>F7M3lnHf_@vq_A+dn@wQdZZ?4}Em_7*=9Cq1i+k{aLk=@--b%O6N3zwpnRYmZa%c=#r}L#7`-fV}EJP9Dk`l zM`^f}NmV)0s)rXLkird49TF1a#E>>24oKs`#IZYa;EZ}fd`_H9bm59GwqCzK&-;AO z^L_n&@UvfnAMJVeynEap|E(~;4~=Vr-$yFgq!jLig*SQ^m!(vCB`fDwvpGpxf%qq$ zkpWGoO2NP=&k|V>RjIOtfqcLZ!2BtH4vIEE0(Zag_Q3D=`HO344%sDa29W!VbqaNg zG+eQ;s@PaVHI{@5Ro&2Za|;!Th2pVj0Y`3X zrBX4l*zU(#h^<8oQ8&f1q7o{`V`4%ybYeCeyqcIwOwY!rCJnuyTJ?%eI@MScNwY{~ zRXb1W0&o)c4)nT>lO}0mg3%f`5^{r^S2kR-*jGC?-pV_8B=j%ku$`6`Lr5ejbXg`e zgpw$fXH-5NU9^-fVlEl=5PGk(y~AQS4DkhFh@;ei3rpM({1Nt^*V?e^n0B(Icck^~ z&Gz{v*Vk@kJO5mqa%O2IbzMq66<=9SOUaOEuqjA1S`-~^PxQe{HSW@Id$%t8!sF-o zA$WMopZB|2a3|t@5gI|?^B3I+qSZ=;ST;q{jns7f75Fviy9DB~?;QN~m>Y(JpSVDB zOgB}ds$n$mR!!295-lxkGHy3IcpXMsP2|k_+ejs*jd$!h_~Firq9})% z))tZ|7M+b=jc$%RgZqX2Y9uob+wc1jJe=kNyJv*oBCa`c4Am6NWRg~Fq!@OIRJTh1 zQgq85+7(3W)W&7R!MFsp-shwhIQE zDnqx~5~-qTa!uK_Ovi*xT{;&3zu{cQG!!W6fdFGix|NpJBO7NI zyT>dS6!kXa*D)2d0W%7+F}0b~&Xk7`+}mL?d+;;YKhU)WTs!s*9yMO>g`f~E=!K&u<6`_vf90R^uY51G$QO0eD(qFcgmrB%D?6<>ahK}HwgE>@%rK9Pl12E zedaFo=FMl>#$>B;w8TbcbIn^gv%GpEyVf?doK9ul%;w;5#@j#mA1Drg^i06rzXktr s*V@IVuEDd+k3#H2p$ASr<)0bso(dNz_bxOvzUSlYzVKak-={tL2T*GYnE(I) diff --git a/connectivity/Library_postgresql-sdbc-impl.mk b/connectivity/Library_postgresql-sdbc-impl.mk index c372f3f0c6f..0343adb24bd 100644 --- a/connectivity/Library_postgresql-sdbc-impl.mk +++ b/connectivity/Library_postgresql-sdbc-impl.mk @@ -46,7 +46,6 @@ $(eval $(call gb_Library_use_externals,postgresql-sdbc-impl,\ boost_headers \ postgresql \ $(if $(filter-out MSC,$(COM)), \ - openssl \ $(if $(ENABLE_LDAP),openldap) \ nss3 \ plc4 \ diff --git a/external/Module_external.mk b/external/Module_external.mk index 28675992778..50d017038ca 100644 --- a/external/Module_external.mk +++ b/external/Module_external.mk @@ -80,7 +80,6 @@ $(eval $(call gb_Module_add_moduledirs,external,\ $(call gb_Helper_optional,NSS,nss) \ $(call gb_Helper_optional,ODFGEN,libodfgen) \ $(call gb_Helper_optional,OPENLDAP,openldap) \ - $(call gb_Helper_optional,OPENSSL,openssl) \ $(call gb_Helper_optional,ORCUS,liborcus) \ $(call gb_Helper_optional,OWNCLOUD_ANDROID_LIB,owncloud-android-lib) \ $(call gb_Helper_optional,PAGEMAKER,libpagemaker) \ diff --git a/oox/CppunitTest_oox_tokenmap.mk b/oox/CppunitTest_oox_tokenmap.mk index 8019da7a230..0c6ab952a81 100644 --- a/oox/CppunitTest_oox_tokenmap.mk +++ b/oox/CppunitTest_oox_tokenmap.mk @@ -20,19 +20,10 @@ $(eval $(call gb_CppunitTest_use_sdk_api,oox_tokenmap)) $(eval $(call gb_CppunitTest_use_library_objects,oox_tokenmap,oox)) -ifeq ($(TLS),OPENSSL) -$(eval $(call gb_CppunitTest_use_externals,oox_tokenmap,\ - openssl \ - openssl_headers \ -)) -else -ifeq ($(TLS),NSS) $(eval $(call gb_CppunitTest_use_externals,oox_tokenmap,\ plc4 \ nss3 \ )) -endif -endif $(eval $(call gb_CppunitTest_use_libraries,oox_tokenmap,\ avmedia \ diff --git a/oox/Library_oox.mk b/oox/Library_oox.mk index 3d8b46b2a24..4a15c0f8466 100644 --- a/oox/Library_oox.mk +++ b/oox/Library_oox.mk @@ -67,19 +67,10 @@ $(eval $(call gb_Library_use_externals,oox,\ boost_headers \ )) -ifeq ($(TLS),OPENSSL) -$(eval $(call gb_Library_use_externals,oox,\ - openssl \ - openssl_headers \ -)) -else -ifeq ($(TLS),NSS) $(eval $(call gb_Library_use_externals,oox,\ plc4 \ nss3 \ )) -endif -endif $(eval $(call gb_Library_set_componentfile,oox,oox/util/oox)) diff --git a/ucb/CppunitTest_ucb_webdav_local_neon.mk b/ucb/CppunitTest_ucb_webdav_local_neon.mk index 2e920f4ca03..a4ea2358d2f 100644 --- a/ucb/CppunitTest_ucb_webdav_local_neon.mk +++ b/ucb/CppunitTest_ucb_webdav_local_neon.mk @@ -32,7 +32,6 @@ $(eval $(call gb_CppunitTest_use_externals,ucb_webdav_local_neon,\ boost_headers \ libxml2 \ neon \ - openssl \ )) $(eval $(call gb_CppunitTest_use_custom_headers,ucb_webdav_local_neon,\ diff --git a/ucb/CppunitTest_ucb_webdav_neon_opts.mk b/ucb/CppunitTest_ucb_webdav_neon_opts.mk index df670ed7afd..020d9f9b6dd 100644 --- a/ucb/CppunitTest_ucb_webdav_neon_opts.mk +++ b/ucb/CppunitTest_ucb_webdav_neon_opts.mk @@ -35,7 +35,6 @@ $(eval $(call gb_CppunitTest_use_externals,ucb_webdav_neon_opts,\ boost_headers \ libxml2 \ neon \ - openssl \ )) $(eval $(call gb_CppunitTest_use_custom_headers,ucb_webdav_neon_opts,\ diff --git a/ucb/CppunitTest_ucb_webdav_propfindcache.mk b/ucb/CppunitTest_ucb_webdav_propfindcache.mk index 8d4a12d32ad..8504a0200ae 100644 --- a/ucb/CppunitTest_ucb_webdav_propfindcache.mk +++ b/ucb/CppunitTest_ucb_webdav_propfindcache.mk @@ -35,7 +35,6 @@ $(eval $(call gb_CppunitTest_use_externals,ucb_webdav_propfindcache,\ boost_headers \ libxml2 \ neon \ - openssl \ )) $(eval $(call gb_CppunitTest_use_custom_headers,ucb_webdav_propfindcache,\ diff --git a/ucb/CppunitTest_ucb_webdav_res_access.mk b/ucb/CppunitTest_ucb_webdav_res_access.mk index fa0669987bd..ad25d29f945 100644 --- a/ucb/CppunitTest_ucb_webdav_res_access.mk +++ b/ucb/CppunitTest_ucb_webdav_res_access.mk @@ -35,7 +35,6 @@ $(eval $(call gb_CppunitTest_use_externals,ucb_webdav_res_access,\ boost_headers \ libxml2 \ neon \ - openssl \ )) $(eval $(call gb_CppunitTest_use_custom_headers,ucb_webdav_res_access,\ diff --git a/ucb/Library_ucpdav1.mk b/ucb/Library_ucpdav1.mk index c76489bd484..2496b80c769 100644 --- a/ucb/Library_ucpdav1.mk +++ b/ucb/Library_ucpdav1.mk @@ -35,7 +35,6 @@ $(eval $(call gb_Library_use_externals,ucpdav1,\ boost_headers \ libxml2 \ neon \ - openssl \ )) $(eval $(call gb_Library_use_custom_headers,ucpdav1,\ @@ -73,7 +72,6 @@ else # WITH_WEBDAV == serf $(eval $(call gb_Library_use_externals,ucpdav1,\ boost_headers \ apr \ - openssl \ serf \ zlib \ )) -- 2.30.2